Modify last change acc to comments

* lisp/simple.el (read-passwd-mode): Change `text' entry of icons.
(read-passwd-toggle-visibility): Rename.
(read-passwd-mode):
* lisp/subr.el (read-passwd-map): Adapt callees.

diff --git a/lisp/simple.el b/lisp/simple.el
index 5992afec255853c1b86a10bed1ba517534c9b95e..f127290231bfd2bac8f34bd6efc7cdb42f555e37 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -10866,7 +10866,7 @@ and setting it to nil."
 (defvar read-passwd--mode-line-icon nil
   "Propertized mode line icon for showing/hiding passwords.")
 
-(defun read-passwd--toggle-visibility ()
+(defun read-passwd-toggle-visibility ()
   "Toggle minibuffer contents visibility.
 Adapt also mode line."
   (interactive)
@@ -10883,7 +10883,7 @@ Adapt also mode line."
             mouse-face mode-line-highlight
             local-map
             (keymap
-             (mode-line keymap (mouse-1 . read-passwd--toggle-visibility)))))
+             (mode-line keymap (mouse-1 . read-passwd-toggle-visibility)))))
     (force-mode-line-update))
   (read-passwd--hide-password))
 
@@ -10902,7 +10902,7 @@ Adapt also mode line."
   (define-icon read-passwd--show-password-icon nil
     '((image "reveal.svg" "reveal.pbm" :height (0.8 . em))
       (symbol "👁")
-      (text "o"))
+      (text "<o>"))
     "Mode line icon to show a hidden password."
     :group mode-line-faces
     :version "30.1"
@@ -10910,7 +10910,7 @@ Adapt also mode line."
   (define-icon read-passwd--hide-password-icon nil
     '((image "conceal.svg" "conceal.pbm" :height (0.8 . em))
       (symbol "⦵")
-      (text "x"))
+      (text "<\\>"))
     "Mode line icon to hide a visible password."
     :group mode-line-faces
     :version "30.1"
@@ -10937,7 +10937,7 @@ Adapt also mode line."
         (setq mode-line-format (cdr mode-line-format)))))
 
   (when read-passwd-mode
-    (read-passwd--toggle-visibility)))
+    (read-passwd-toggle-visibility)))
 
 \f
 (defvar messages-buffer-mode-map

diff --git a/lisp/subr.el b/lisp/subr.el
index d89c69976e42896b930390222a9516c8118c394e..d58f8ba3b27aac7aae147ede122d727c8ae7a108 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3378,7 +3378,7 @@ with Emacs.  Do not call it directly in your own packages."
   (let ((map (make-sparse-keymap)))
     (set-keymap-parent map minibuffer-local-map)
     (define-key map "\C-u" #'delete-minibuffer-contents) ;bug#12570
-    (define-key map "\t" #'read-passwd--toggle-visibility)
+    (define-key map "\t" #'read-passwd-toggle-visibility)
     map)
   "Keymap used while reading passwords.")